From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 29 Jan 2013 00:49:02 +0000 (-0500)
Subject: shell: Remove old jsapi-compat file
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4941
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=23717cc4d7f9442aff2ab60775d0156b91721449;p=gnome-shell.git

shell: Remove old jsapi-compat file

As we now depend on mozjs185, we know the API we'll be porting to.

https://bugzilla.gnome.org/show_bug.cgi?id=693284
---

diff --git a/src/Makefile.am b/src/Makefile.am
index d79d207ea..6a6bb2426 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -145,7 +145,6 @@ libgnome_shell_la_SOURCES =		\
 	shell-app-system-private.h	\
 	shell-embedded-window-private.h	\
 	shell-global-private.h		\
-	shell-jsapi-compat-private.h	\
 	shell-window-tracker-private.h	\
 	shell-wm-private.h		\
 	gnome-shell-plugin.c		\
diff --git a/src/shell-global.c b/src/shell-global.c
index 32da177ab..122034697 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -35,7 +35,6 @@
 
 #include "shell-enum-types.h"
 #include "shell-global-private.h"
-#include "shell-jsapi-compat-private.h"
 #include "shell-perf-log.h"
 #include "shell-window-tracker.h"
 #include "shell-wm.h"
diff --git a/src/shell-jsapi-compat-private.h b/src/shell-jsapi-compat-private.h
deleted file mode 100644
index 7f0304bc0..000000000
--- a/src/shell-jsapi-compat-private.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * shell-jsapi-compat.h: Compatibility wrapper for older Spidermonkey
- *
- * Copyright 2010 Red Hat, Inc.
-*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU Lesser General Public License,
- * version 2.1, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
- * more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
- * Boston, MA 02111-1307, USA.
- *
- */
-
-#ifndef __SHELL_JSAPI_COMPAT_H__
-#define __SHELL_JSAPI_COMPAT_H__
-
-#include "config.h"
-
-#ifndef HAVE_JS_NEWGLOBALOBJECT
-
-/* The old JS_AddRoot accepted anything via void *, new
- * api is stricter.
- */
-#define JS_AddValueRoot JS_AddRoot
-#define JS_AddObjectRoot JS_AddRoot
-#define JS_AddStringRoot JS_AddRoot
-#define JS_AddGCThingRoot JS_AddRoot
-#define JS_RemoveValueRoot JS_RemoveRoot
-#define JS_RemoveObjectRoot JS_RemoveRoot
-#define JS_RemoveStringRoot JS_RemoveRoot
-#define JS_RemoveGCThingRoot JS_RemoveRoot
-
-#endif
-
-#endif